This repository has been archived by the owner on Dec 2, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 213
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # cabal.project # doc/plutus-doc.cabal # flake.lock # nix/pkgs/haskell/cabal-install.sha # nix/pkgs/haskell/cardano-repo-tool.sha # nix/pkgs/haskell/haskell.nix # nix/pkgs/haskell/hls-darwin.sha # nix/pkgs/haskell/hls-linux.sha # nix/pkgs/haskell/materialized-darwin/.plan.nix/Win32-network.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/base-deriving-via.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-chain.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/byron-spec-ledger.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses-cli.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-addresses.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-api.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary-test.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-binary.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-class.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-praos.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-test.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-tests.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto-wrapper.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-crypto.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-alonzo.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron-test.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-byron.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-core.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-pretty.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-ma.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley-test.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-ledger-shelley.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-numeric.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude-test.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-prelude.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-protocol-tpraos.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-slotting.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-cli.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core-integration.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-core.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-launcher.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet-test-utils.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/cardano-wallet.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/contra-tracer.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/dbvar.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/flat.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/iohk-monitoring.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-aggregation.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-ekg.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-monitoring.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-backend-trace-forwarder.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/lobemo-scribe-systemd.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/measures.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/non-integral.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/orphans-deriving-via.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-doc.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ghc-stub.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-ledger-api.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-playground-server.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-use-cases.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/prettyprinter-configurable.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/purescript-bridge.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger-test.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/shelley-spec-ledger.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps-test.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/small-steps.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-containers.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/strict-non-empty-containers.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/text-class.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/tracer-transformers.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/word-array.nix # nix/pkgs/haskell/materialized-darwin/default.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/Win32-network.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/base-deriving-via.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-chain.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/byron-spec-ledger.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses-cli.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-addresses.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-api.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary-test.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-binary.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-class.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-praos.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-test.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-tests.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto-wrapper.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-crypto.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-alonzo.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron-test.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-byron.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-core.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-pretty.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-ma.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley-test.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-ledger-shelley.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-numeric.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude-test.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-prelude.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-protocol-tpraos.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-slotting.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-cli.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core-integration.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-core.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-launcher.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet-test-utils.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/cardano-wallet.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/contra-tracer.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/dbvar.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/flat.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/iohk-monitoring.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-aggregation.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-ekg.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-monitoring.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-backend-trace-forwarder.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/lobemo-scribe-systemd.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/measures.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/non-integral.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/orphans-deriving-via.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-doc.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ghc-stub.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-ledger-api.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-playground-server.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-use-cases.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/prettyprinter-configurable.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/purescript-bridge.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger-test.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/shelley-spec-ledger.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps-test.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/small-steps.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/strict-containers.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/strict-non-empty-containers.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/text-class.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/tracer-transformers.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/word-array.nix # nix/pkgs/haskell/materialized-linux/default.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/Win32-network.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/base-deriving-via.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-chain.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/byron-spec-ledger.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses-cli.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-addresses.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-api.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary-test.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-binary.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-class.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-praos.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-test.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-tests.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto-wrapper.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-crypto.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-alonzo.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron-test.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-byron.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-core.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-pretty.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-ma.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley-test.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-ledger-shelley.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-numeric.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude-test.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-prelude.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-protocol-tpraos.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-slotting.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-cli.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core-integration.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-core.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-launcher.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet-test-utils.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/cardano-wallet.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/contra-tracer.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/dbvar.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/flat.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/iohk-monitoring.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-aggregation.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-ekg.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-monitoring.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-backend-trace-forwarder.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/lobemo-scribe-systemd.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/measures.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/non-integral.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/orphans-deriving-via.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-doc.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ghc-stub.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-ledger-api.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-playground-server.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx-plugin.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-use-cases.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/prettyprinter-configurable.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/purescript-bridge.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger-test.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/shelley-spec-ledger.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps-test.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/small-steps.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/strict-containers.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/strict-non-empty-containers.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/text-class.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/tracer-transformers.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/word-array.nix # nix/pkgs/haskell/materialized-windows/default.nix # plutus-playground-server/plutus-playground-server.cabal # plutus-use-cases/plutus-use-cases.cabal # shell.nix
# Conflicts: # cabal.project # flake.lock # nix/pkgs/haskell/cabal-install.sha # nix/pkgs/haskell/cardano-repo-tool.sha # nix/pkgs/haskell/haskell.nix # nix/pkgs/haskell/hls-darwin.sha # nix/pkgs/haskell/hls-linux.sha # nix/pkgs/haskell/materialized-darwin/default.nix # nix/pkgs/haskell/materialized-linux/default.nix # nix/pkgs/haskell/materialized-windows/default.nix
small fixes
# Conflicts: # cabal.project # nix/pkgs/haskell/haskell.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-contract.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-core.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx-plugin.nix # nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-tx.nix # nix/pkgs/haskell/materialized-darwin/default.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-contract.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-core.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx-plugin.nix # nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-tx.nix # nix/pkgs/haskell/materialized-linux/default.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-contract.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx-plugin.nix # nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix # nix/pkgs/haskell/materialized-windows/default.nix # plutus-contract/plutus-contract.cabal
@angerman I am tasked with reviewing and organizing Pull Request backlogs and need your help please. Would you review the PR and let me know if it still applies? If you need more time to review, you may transition it to |
Closing this PR as it is stale. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.